322238c54ad97db77d95ef3e6b49c619029813ef,applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java,UspsServices,uspsCityStateLookup,#DispatchContext#Map#,600
Before Change
Document responseDocument = null;
try {
responseDocument = sendUspsRequest("CityStateLookup", requestDocument);
} catch (UspsRequestException e) {
Debug.log(e, module);
return ServiceUtil.returnFailure("Error sending request for USPS City/State Lookup service: " + e.getMessage());
}
Element respAddressElement = UtilXml.firstChildElement(responseDocument.getDocumentElement(), "ZipCode");
if (respAddressElement == null) {
return ServiceUtil.returnFailure("Incomplete response from USPS City/State Lookup service: no ZipCode element found");
}
Element respErrorElement = UtilXml.firstChildElement(respAddressElement, "Error");
if (respErrorElement != null) {
return ServiceUtil.returnFailure(UtilXml.childElementValue(respErrorElement, "Description"));
}
Map<String, Object> result = ServiceUtil.returnSuccess();
After Change
*/
public static Map<String, Object> uspsCityStateLookup(DispatchContext dctx, Map<String, ? extends Object> context) {
Delegator delegator = dctx.getDelegator();
String shipmentGatewayConfigId = (String) context.get("shipmentGatewayConfigId");
String resource = (String) context.get("configProps");
Locale locale = (Locale) context.get("locale");
Document requestDocument = createUspsRequestDocument("CityStateLookupRequest", true, delegator, shipmentGatewayConfigId, resource);
Element zipCodeElement = UtilXml.addChildElement(requestDocument.getDocumentElement(), "ZipCode", requestDocument);
zipCodeElement.setAttribute("ID", "0");
String zipCode = ((String) context.get("zip5")).trim(); // trim leading/trailing spaces
// only the first 5 digits are used, the rest are ignored
UtilXml.addChildElementValue(zipCodeElement, "Zip5", zipCode, requestDocument);
Document responseDocument = null;
try {
responseDocument = sendUspsRequest("CityStateLookup", requestDocument, delegator, shipmentGatewayConfigId, resource, locale);
} catch (UspsRequestException e) {
Debug.log(e, module);
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
"FacilityShipmentUspsCityStateLookupSendingError",
UtilMisc.toMap("errorString", e.getMessage()), locale));
}
Element respAddressElement = UtilXml.firstChildElement(responseDocument.getDocumentElement(), "ZipCode");
if (respAddressElement == null) {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
"FacilityShipmentUspsCityStateLookupIncompleteResponse", locale));
}
Element respErrorElement = UtilXml.firstChildElement(respAddressElement, "Error");
if (respErrorElement != null) {
return ServiceUtil.returnFailure(UtilProperties.getMessage(resourceError,
"FacilityShipmentUspsCityStateLookupResponseError",
UtilMisc.toMap("errorString", UtilXml.childElementValue(respErrorElement, "Description")), locale));
}
Map<String, Object> result = ServiceUtil.returnSuccess();